Misc fixing