Beautification

Pre-delivery fixes.