Fixes for 1.6.1