Fix some the closure compiler issues