Studio fixes and engine project