Bug Fix

Database fixes

Stewan
Stewan
Engineering