Fix remaining issues with reloader

 #594