src - Small fixes