Working on #436 - Fixes small issues