starting to port in 1.6.x fixes