[DEV] Some Fixes from last Commits.

Signed-off-by: Salja <salja8840@gmail.com>