Fixing up errors