Final stable havana fixes

Won't these two lines give an 'unexpected indent' error?