pedantic fixes