Fixes for @dbu review