Miscellaneous fix