CEP-151 small bug fixes