miscellanous fix