Miscellaneous fixes (per gruns)