Bug fixing and other