MOre fixes