Fix some strict standards