Validation

More fixes

Signed-off-by: Joshua Pekera <joshuapekera@me.com>