Fixed an abundance of warnings