Fixed validation stuff