Fix some more issues raised by Philipp and Victor