Small fixes, warnings, RSpec upgrades for the future