General Fixes

+Quick fix test.