Engine: Fixing lint problems