Fix several bigs