Fixes and init.recovery support