Speed bug fixes