Variouse fixes