Fixing issues that make this work