Last minute blocker bugs