Small fixes + additions