r5034 & lil fixes