Fixes missing uid and hash vars