Cleaning more warnings