Small prophunt fix/cleanup