Minor hotfixes (mostly gcc build fixes)