Small updates to get it running with maven