Fix maven and stuff