+ Fix a few size problems