Release 1.5.0 - Couple of small fixes for bugs found in testing