Fixed some issues generated by the previous commit