Azilroka's fixes.