129f229 Minor fixes