Minors Fix

Non important fixes