Misc2

Two little improvements.