FIxing a fe bugs with this.