1.6.3: Even more small bug fixes!