More 1.5 stuff, just one compile error left