Fix bug in setting object.axis; minor adjustments for 6.11