Fixed issues caused by git: everything (except switch and postfix expressions) is now working