[Martin] some minor changes