Loooots of fixes