Quickly fixed warnings throughout