Bug fixes in newly-used code