Minor functionlity changes