Fixed issues found preparing for FOSS4G NA