Bug messages for proper construction bugs adapted.