compile fix
Some more stuff