manor fixes