Bug fixing and stability improvements