Fixed things so it compiles