Small tickets: fix #13, fix #17, fix #23