Minor changes for compatibility