Clean up some loose ends in 12.04