Tiny code changes