Minor changes to form embedding