Ficed minor bugs