Review & fixing some small defects