fixed mixed contetn warnings