Some size fixes