Fixed explicit definition, other improvements