More minor 1.6 updates

Once again, don't trust me much on these too much