Fixes for some cases.