Cleaned up a few residual issues