Fix some layer crappiness!