Some last min 1.5.1 changes and fixes from dev