Fix some compilation problem with maven