1.5 stable fixes