FIX: Some smaller follow up fixes. Will stash before merge.