Quick rework on a few things