necessary fixes for official repo