Fixing compilation issues, and exposing a public method!