more embed fixes