More warning fixes

This passes make check, but if it might conflict with the FEMContext API usage upgrade it's not urgent to commit.