Fixes for 1.5