Fixing birthday bugs