Fix some details