Adds some minor fixes