Minor element improvements