Fixes for repo