Apply minor fixes