little fixes to help in debugging by being less strict