Small fixes and dev debug tab