Fixes for latest commit