Little fixes, find where the bug is.