Multiple fixes...