Fix warnings (#537)