Minor patches on error / message output