FIXES for new Layer API