Additional v3 fixes

fixes #252 and #254