fixes: legacy issues