Fixes and temp stuff