Fix some layering issue