post live fixes - 169 + 164