Fixes and whatsoever