Some extra fixes