Fix more BUGS