Fixing more compiler errors