Fixed some issues with last commit