fixes for prior commit