New figure bug fixes