Some extra cleanup to ge things working properly.