Minor usability changes in order to easier reuse or c/p code.