Fixes after real testing.