Fixed minor layer issues in 1.2.4