Fixes based on Chris' feedback