Misc fixed.