Fixed issues for code to compile (you know...)