fixes due to new layout of members