Add minor improvements