Fixes for 1.2