Make a few bug fixes (by shader)