Fix for smaller issues, will work on second major issue soon