Fixed some issues introduced by the last commit