Fixing Zoltan's review findings