Fixed 3 blocking bugs.