Debug and small style tweaks