Fixes for ch 12