Standalone plus other fixes