Small fixes for the sake of consistency