Fixed some inconsistencies, that were found during tests this weekend.