Fixes and highest severity requests from Szymon