Applying bug fixes