Additional logic fixes