More temporary clean-up
fixed minor assertion error in spot