various fixes to new loading scheme