BUG FIXES SQLITE