Revert "Revert "maintenance compilation fixes""
Revert "Revert "maintenance compilation fixes""

This reverts commit 8b8200f32ed16032d2e276d5d8334cd1214262c8.

tmj-fstate/maszyna,eu07/maszyna,tmj-fstate/maszyna,firleju/maszyna,tmj-fstate/maszyna,tmj-fstate/maszyna,eu07/maszyna,eu07/maszyna,firleju/maszyna,tmj-fstate/maszyna