Fixes for 104

Strange errors on 104 that I didn't get locally...