Apply Fission's patch from the forums (various small fixes)