Fixes all around.