Minor fixes to DROP dropping HBase metadata by default as well