Fixes for small debug stuff