Fixes for 5 or so of the bugs