Small changes & bug fixes