fixes after validation