Multiple minor fixes

Yes, its not 4.3 compatible, but it still fixes a bunch of little issues i've noticed