Fix warnings in Rwr project

There were some enum warnings and a bit of really funky boolean logic
that needed fixing.