Fixes for my project