Bug & validation fixing