Changes to previous commit, removal of warnings

BPM status function lost a variable in previous commit, this has been
fixed, and the warnings in the compilation of drive have been removed by
replacing -1 with std::string::npos.