fixes for 9c69cc30be59bea568456ec0c22635d77922427d
clean up