Fixed several issues after running a validation tool