Applying latest bug fixes