Fixes for project i'm working on