Misc. related to #43. closed #44