Miscellaneous changes for debugging purposes