A few logic fixes