Fix some places that still hard coded cache line sizes
Other misc cleanup