Apply minor code changes