Fixed some layers