Fix some cleanup needed