Fixed Issues From Piotr Notes