Clean up some presentation problems