Applying modifications as requested by octo from GitHub