Cleaned up some issues introduced in recent commits