0.13 in progress, fix missing vars declarations