[MASTER] Fixes from master branch