Misc fixing.