clear compiler warnings discovered after merge