Fixes to prev. commit