Make two fixes for issue #143, thanks for the spot gleeda!