Fixed Tam's fixes