Fixes for last commit