Minor fixes in elementary.