Fixes from last commit