Cleanups after @tzz review