Fixing up compile bugs