Fix a 200 or 300 bugs