fixing small bugs according to meta diff