Fixed some versus bugs and inconveniences