Fix post-merge errors
(#426)