Minor fixes to make master represent a Debug release