Lame fixes