Bilge logic fixes