Misc bug and balance fixes