Fixes based on Indonesian output