Bug fixing for both back and front ends