Fixes misc