Latest updates so it should compile (fixes)