Fixes by Azilroka