Some fixes in untested areas that haven't been used for a long time