Misc fixed