fixes in akademia scenario