Code changes for bug fixing?