Fixing up compiler errors