[PATCH conductor 2/2] Layout fixes