Fixed bugs reported as Issues