moarh fixes