Some fixes in A Wedding Song