Fixing tiny stuff