Minor hotfixes due to merge errors #71

Closed josephbirkner closed 6 years ago