Oct 05, 2018 - A few Fixes