Improve several implementations