Multiple changes

Commits message are self-explanatory