Fixing the most obvious errors