Minor element fixes