Little code changes