During the last meeting, some problems were pointed out.
This commit should fix some of them.