Fix several issues, remove validation