Bug fixing and 1.9.3 compatibility