Some size improvements