Fixed various issues due to missing load-database operations