Fixed layer issues