P0 quick fixes

Please merge this so we can mark the associated stories Delivered.