SL clean up and attempt to fix issue #176