Added some temporary debugging options