Fixes for the latest review