Fixed some embedded stuff