Minor comestic fixes