more compiler fixes, remove dup definitions