Fixes for last PR