Fixes for prev commit