Fix some legacy features #408