Various fixes
more memory required
Don't set :UNIQUE if it's nil
d'oh