Minor changes in Javadoc and SQL