Fix for db issues on Linux