Fixes, actually working now.