Nmf style pom hell + case typo

All 4 commits cherry-picked from master