fix for missing vars, build/test