Fix Some Minor Bugs

Signed-off-by: Sakretsos <ioannis@tavernarakis.eu>