Fixed stuff so that it compiles