A few more tweaks and fixes for the sample database