Fix cluster start problems