#12: Fixed minor issues