Minor API cleanup