Fixes more non-sense issues