Some more fixes
v. 1.1.5