Fixes for sine waves