Fixes from Jalakas