Fixes to slave startup