Fixed 2 slippery little bugs