Minor changes to check usage