Fixing the simple stuff.