Various layer fixes: