Fixed some issues
Trying push