Fixed

Backup for some fixes according to the Init (given) version