Fixes after tests