Minor changes, debug messages