[#517] Make Dominik happy plus minor re addition