Fix: Miscellaneous fixes