NOJIRA mattress fixes