Updating files with bug fixes