Fixing up more compiler issues