fixes related to new css loading refactor