Some little bugfixes to current codebase