Bug fixes, prevent direct access