Some extra fixes...