Also rake server:run is more robust now