Fixed some strict validation errors