Various updates to speed up drawing