Some more code changes