Fixed update issues, see #372