Fix two small issues
Version 0.2