Valama: Focus fixes