Fixes based on Chris' review