Miscellaneous fixes during trials