UPD: Fixes from raijin