Fixing bunch of things