Small fixes were made, everything seems to be working ok