some extra fixes