Small changes, need to cleanup and rebase later