A few more logic updates to work correctly.