Fixed issues that prevented non-hybrid mode from running correctly