Sla fixes

As per the pivotal bugs