Various controller fixes Closes #936 and #937 See merge request STJr/SRB2!1914
mentioned in commit 5827a19b