fixes for origin