Fixes another size issue, adds better logging