fixed up stuff for gradle to compile things properly...