Fixed a couple of bugs with setup and rebindings