Fixed some bugs with the recently modified methods.