Fixing tiny bugs