Added tiny fixes