Added circular saw fixes