Fixing 'empty field' errors