Fixes for single base elements