Josh: couple quick fixes and changes