fixes for 19