Fix some minor bugs
One more