Finish Leslie fixes