Quick update & fix