2 another bugs squashed (thx to Maxime Weber)