Cleanup/init.d fixes