Several Little fixes