Minor adjustments after testing