Fixes for last PR, tiny cleanup.