Fixes minor kinks