move to FSW maven version, misc fixes