misc fixed