merge misc fixes from v2.4 #603

fixes #603